name: pre-commit run_id: commands[2] env HOME: /home/jenkins env LANG: C.UTF-8 env OLM_TIMER1: 3000 env OLM_TIMER2: 2000 env PATH: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit/bin:/opt/pyenv/bin:/tmp/venv-D95S/bin:/opt/pyenv/shims:/home/jenkins/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/puppetlabs/bin env PIP_DISABLE_PIP_VERSION_CHECK: 1 env PIP_USER: 0 env PYTHONHASHSEED: 2971399550 env PYTHONIOENCODING: utf-8 env SSH_AUTH_SOCK: ******************************** env TOX_ENV_DIR: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit env TOX_ENV_NAME: pre-commit env TOX_WORK_DIR: /w/workspace/transportpce-tox-verify-transportpce-master/.tox env VIRTUAL_ENV: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit env __TOX_ENVIRONMENT_VARIABLE_ORIGINAL_CI: true metadata pid: 2574 cwd: /w/workspace/transportpce-tox-verify-transportpce-master/tests allow: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit/bin/*:sh:cpan:sudo:which:fixCIcentOS8reposMirrors.sh cmd: pre-commit run --all-files --show-diff-on-failure exit_code: 1 [INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks. [INFO] Initializing environment for https://github.com/jorisroovers/gitlint. [INFO] Initializing environment for https://github.com/jorisroovers/gitlint:./gitlint-core[trusted-deps]. [INFO] Initializing environment for https://github.com/Lucas-C/pre-commit-hooks. [INFO] Initializing environment for https://github.com/pre-commit/mirrors-autopep8. [INFO] Initializing environment for https://github.com/perltidy/perltidy. [INFO] Initializing environment for https://github.com/koalaman/shellcheck-precommit. [INFO] Initializing environment for https://github.com/pre-commit/mirrors-prettier. [INFO] Initializing environment for https://github.com/pre-commit/mirrors-prettier:prettier@4.0.0-alpha.8. [INFO] Initializing environment for https://github.com/adrienverge/yamllint. [INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/Lucas-C/pre-commit-hooks. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/pre-commit/mirrors-autopep8. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/perltidy/perltidy. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/pre-commit/mirrors-prettier. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/adrienverge/yamllint. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... trim trailing whitespace.................................................Passed fix end of files.........................................................Passed check for added large files..............................................Passed check for merge conflicts................................................Passed check for case conflicts.................................................Passed check json...............................................................Passed mixed line ending........................................................Passed Tabs remover.............................................................Passed autopep8.................................................................Failed - hook id: autopep8 - files were modified by this hook perltidy.................................................................Passed ShellCheck v0.10.0.......................................................Passed prettier.................................................................Passed yamllint.................................................................Passed pre-commit hook(s) made changes. If you are seeing this message in CI, reproduce locally with: `pre-commit run --all-files`. To run `pre-commit` as part of git workflow, use `pre-commit install`. All changes made by hooks: diff --git a/tests/transportpce_tests/common/simulators.py b/tests/transportpce_tests/common/simulators.py index 61effeba2..a55aadd7a 100644 --- a/tests/transportpce_tests/common/simulators.py +++ b/tests/transportpce_tests/common/simulators.py @@ -34,7 +34,7 @@ SIMS = { ('xpdra2', '7.1'): {'port': '17857', 'configfile': 'oper-XPDRA2.xml', 'logfile': 'xpdra2-71.log', 'restconf_baseurl': 'http://127.0.0.1:8157/restconf'}, ('xpdrc2', '7.1'): {'port': '17858', 'configfile': 'oper-XPDRC2.xml', 'logfile': 'xpdrc2-71.log', 'restconf_baseurl': 'http://127.0.0.1:8158/restconf'}, ('oc-mpdra', 'oc'): {'port': '19840', 'configfile': 'sample-openconfig-mpdr.xml', 'logfile': - 'sample-openconfig-mpdra.log', 'restconf_baseurl': 'http://127.0.0.1:8159/restconf'}, + 'sample-openconfig-mpdra.log', 'restconf_baseurl': 'http://127.0.0.1:8159/restconf'}, ('oc-mpdrc', 'oc'): {'port': '19844', 'configfile': 'sample-openconfig-mpdr.xml', 'logfile': - 'sample-openconfig-mpdrc.log', 'restconf_baseurl': 'http://127.0.0.1:8160/restconf'} + 'sample-openconfig-mpdrc.log', 'restconf_baseurl': 'http://127.0.0.1:8160/restconf'} } diff --git a/tests/transportpce_tests/oc/test04_end2end.py b/tests/transportpce_tests/oc/test04_end2end.py index 1cc598750..e28c3faf1 100644 --- a/tests/transportpce_tests/oc/test04_end2end.py +++ b/tests/transportpce_tests/oc/test04_end2end.py @@ -118,14 +118,14 @@ class TestTransportPCEEndtoend4Nodes(unittest.TestCase): del_serv_input_data = { "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-delete", - "request-system-id": "appname", - "notification-url": "http://localhost:8585/NotificationServer/notify"}, - "service-delete-req-info": { - "service-name": "TBD", - "tail-retention": "no"} - } + "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", + "rpc-action": "service-delete", + "request-system-id": "appname", + "notification-url": "http://localhost:8585/NotificationServer/notify"}, + "service-delete-req-info": { + "service-name": "TBD", + "tail-retention": "no"} + } WAITING = 20 NODE_VERSION_221 = '2.2.1' @@ -254,17 +254,17 @@ class TestTransportPCEEndtoend4Nodes(unittest.TestCase): self.assertNotIn('ietf-network-topology:link', response['network'][0]) def test_15_check_optical_channel(self): - response = test_utils_oc.check_node_attribute2_request( - 'OC-MPDRA', 'component', 'cfp2-opt-1-1', 'openconfig-terminal-device:optical-channel') - self.assertEqual(response['status_code'], requests.codes.ok) - self.assertDictEqual(dict({'config': {'frequency': '196100000', 'operational-mode': 4308, - 'target-output-power': '0.0'}}, **response['openconfig-terminal-device:optical-channel']), - response['openconfig-terminal-device:optical-channel']) + response = test_utils_oc.check_node_attribute2_request( + 'OC-MPDRA', 'component', 'cfp2-opt-1-1', 'openconfig-terminal-device:optical-channel') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertDictEqual(dict({'config': {'frequency': '196100000', 'operational-mode': 4308, + 'target-output-power': '0.0'}}, **response['openconfig-terminal-device:optical-channel']), + response['openconfig-terminal-device:optical-channel']) def test_16_service_create_och_otu4(self): response = test_utils.transportpce_api_rpc_request( - 'org-openroadm-service', 'service-create', - self.cr_serv_input_data) + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) self.assertEqual(response['status_code'], requests.codes.ok) time.sleep(self.WAITING) @@ -292,8 +292,8 @@ class TestTransportPCEEndtoend4Nodes(unittest.TestCase): del self.cr_serv_input_data["service-a-end"]["otu-service-rate"] del self.cr_serv_input_data["service-z-end"]["otu-service-rate"] response = test_utils.transportpce_api_rpc_request( - 'org-openroadm-service', 'service-create', - self.cr_serv_input_data) + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) self.assertEqual(response['status_code'], requests.codes.ok) time.sleep(self.WAITING)